merge trunk
authorK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (00:04 +0900)
committerK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (00:04 +0900)
commitb21835800310cbd0059771b2fefde4c51164227d
treef25d019b6e63783cc638e20e784ca48369fb5bbc
parentbc44b0fda0ed41b5380214469fa87749168bf452
parentd3d68d07a77e8fed1c8e3b5ab5ad338e44dcce46
merge trunk